From 19af97d05ab586d221cbffe078a0a6165c3d9564 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Fri, 2 Jan 2015 23:02:55 +0000 Subject: [PATCH] Delete unused fn in mainwindow.cc. Bump version number to prep for release. --- gpsbabel/configure | 20 ++++++++++---------- gpsbabel/configure.in | 4 ++-- gpsbabel/gbversion.h | 4 ++-- gpsbabel/gui/mainwindow.cc | 24 ------------------------ 4 files changed, 14 insertions(+), 38 deletions(-) diff --git a/gpsbabel/configure b/gpsbabel/configure index 84f3d5a27..9a2745116 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.1. +# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.2. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GPSBabel' PACKAGE_TARNAME='gpsbabel' -PACKAGE_VERSION='1.5.1' -PACKAGE_STRING='GPSBabel 1.5.1' +PACKAGE_VERSION='1.5.2' +PACKAGE_STRING='GPSBabel 1.5.2' PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS' PACKAGE_URL='' @@ -1285,7 +1285,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPSBabel 1.5.1 to adapt to many kinds of systems. +\`configure' configures GPSBabel 1.5.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1351,7 +1351,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPSBabel 1.5.1:";; + short | recursive ) echo "Configuration of GPSBabel 1.5.2:";; esac cat <<\_ACEOF @@ -1451,7 +1451,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPSBabel configure 1.5.1 +GPSBabel configure 1.5.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1858,7 +1858,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPSBabel $as_me 1.5.1, which was +It was created by GPSBabel $as_me 1.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2206,7 +2206,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -DOCVERSION=1.5.1 +DOCVERSION=1.5.2 # YYYYMMDD, please, if beta, i.e. "-beta20060413" #DOCVERSION=development @@ -5694,7 +5694,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPSBabel $as_me 1.5.1, which was +This file was extended by GPSBabel $as_me 1.5.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5756,7 +5756,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GPSBabel config.status 1.5.1 +GPSBabel config.status 1.5.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 353fe112a..e10ee475d 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -4,8 +4,8 @@ AC_PREREQ(2.59) #PACKAGE_RELEASE= -AC_INIT(GPSBabel, 1.5.1, BUG-REPORT-ADDRESS) -DOCVERSION=1.5.1 +AC_INIT(GPSBabel, 1.5.2, BUG-REPORT-ADDRESS) +DOCVERSION=1.5.2 # YYYYMMDD, please, if beta, i.e. "-beta20060413" #DOCVERSION=development diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index 0e2f76c4c..c66b3ff75 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.5.1" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.1" +#define VERSION "1.5.2" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.5.2" diff --git a/gpsbabel/gui/mainwindow.cc b/gpsbabel/gui/mainwindow.cc index 3ca27c5d1..337b2bcb9 100644 --- a/gpsbabel/gui/mainwindow.cc +++ b/gpsbabel/gui/mainwindow.cc @@ -83,30 +83,6 @@ bool MainWindow::allowBetaUpgrades() return isBeta_ || babelData_.allowBetaUpgrades_; } -//------------------------------------------------------------------------ -static QStringList getCharSets() -{ - QProcess babel; - babel.start("gpsbabel", QStringList() << "-l"); - if (!babel.waitForStarted()) - return QStringList(); - babel.closeWriteChannel(); - if (!babel.waitForFinished()) - return QStringList(); - - QStringList strList; - QTextStream tstream(babel.readAll()); - while(!tstream.atEnd()) { - QString l = tstream.readLine(); - if (QRegExp("^\\*").indexIn(l) == 0) { - l.replace(QRegExp("^[\\*\\s]*"), ""); - l.replace(QRegExp("[\\s]+$"), ""); - strList << l; - } - } - return strList; -} - //------------------------------------------------------------------------ static QString MakeOptions(const QList& options) { -- 2.30.2